Don't leak tree model and tree row reference. (#148125, Crispin Flowerday)

Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak
	tree model and tree row reference.  (#148125, Crispin Flowerday)

diff --git a/ChangeLog b/ChangeLog
index 8d7d291ba5b6996e281486464c5279deb096621e..02551cd49a02a806c3615db57493db514bf6e437 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak
+       tree model and tree row reference.  (#148125, Crispin Flowerday)
+
 Wed Jul 21 22:17:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testcombo.c (main): Don't leak models.  (#148128,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8d7d291ba5b6996e281486464c5279deb096621e..02551cd49a02a806c3615db57493db514bf6e437 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak
+       tree model and tree row reference.  (#148125, Crispin Flowerday)
+
 Wed Jul 21 22:17:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testcombo.c (main): Don't leak models.  (#148128,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8d7d291ba5b6996e281486464c5279deb096621e..02551cd49a02a806c3615db57493db514bf6e437 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak
+       tree model and tree row reference.  (#148125, Crispin Flowerday)
+
 Wed Jul 21 22:17:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testcombo.c (main): Don't leak models.  (#148128,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8d7d291ba5b6996e281486464c5279deb096621e..02551cd49a02a806c3615db57493db514bf6e437 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak
+       tree model and tree row reference.  (#148125, Crispin Flowerday)
+
 Wed Jul 21 22:17:06 2004  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testcombo.c (main): Don't leak models.  (#148128,

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 14600a29c10dbbcef2aa7e65337c6a85efbdc964..2771c893e6d7b0523231ffa2615a5407f642c064 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -293,7 +293,15 @@ gtk_cell_view_style_set (GtkWidget *widget,
 static void
 gtk_cell_view_finalize (GObject *object)
 {
-  gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (object));
+  GtkCellView *cellview = GTK_CELL_VIEW (object);
+
+  gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (cellview));
+
+  if (cellview->priv->model)
+     g_object_unref (cellview->priv->model);
+
+  if (cellview->priv->displayed_row)
+     gtk_tree_row_reference_free (cellview->priv->displayed_row);
 
   if (G_OBJECT_CLASS (parent_class)->finalize)
     (* G_OBJECT_CLASS (parent_class)->finalize) (object);